GtkStyleSet: Fix compiler warning.
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 4 Aug 2010 15:50:52 +0000 (17:50 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Sat, 4 Dec 2010 14:37:35 +0000 (15:37 +0100)
gtk/gtkstyleset.c

index d2053db7ac533c19c59f7361a452d104e127569c..e8b96cc1cc216510cd37e882651160107e1f92c6 100644 (file)
@@ -601,7 +601,7 @@ gtk_style_set_get_valist (GtkStyleSet  *set,
         }
       else
         {
-          GValue *val;
+          GValue *val = NULL;
 
           if (prop)
             {
@@ -610,7 +610,8 @@ gtk_style_set_get_valist (GtkStyleSet  *set,
               else if (G_IS_VALUE (&prop->default_value))
                 val = &prop->default_value;
             }
-          else
+
+          if (!val)
             val = &node->default_value;
 
           if (G_VALUE_TYPE (val) == GTK_TYPE_SYMBOLIC_COLOR)